Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 25 May 2010 22:48:43 +0000 (22:48 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 25 May 2010 22:48:43 +0000 (22:48 +0000)

Trivial merge